client-management-service-impl/src/test/java/io/mosip/esignet/ClientDetailRepositoryTest.java (1)

293-319: Assert encPublicKeyHash values to fully validate persistence.
Right now only null/non-null is verified. Capture expected hashes and assert equality after fetch/update.

🧪 Suggested test tightening

@@
-        clientDetail.setEncPublicKeyHash(UUID.randomUUID().toString());
+        String encPublicKeyHash = UUID.randomUUID().toString();
+        clientDetail.setEncPublicKeyHash(encPublicKeyHash);
@@
-        Assertions.assertEquals("DUMMY ENC PUBLIC KEY", result.get().getEncPublicKey());
+        Assertions.assertEquals("DUMMY ENC PUBLIC KEY", result.get().getEncPublicKey());
+        Assertions.assertEquals(encPublicKeyHash, result.get().getEncPublicKeyHash());
@@
-        clientDetail.setEncPublicKeyHash(UUID.randomUUID().toString());
+        String updatedEncPublicKeyHash = UUID.randomUUID().toString();
+        clientDetail.setEncPublicKeyHash(updatedEncPublicKeyHash);
@@
-        Assertions.assertEquals("UPDATED ENC PUBLIC KEY", result.get().getEncPublicKey());
+        Assertions.assertEquals("UPDATED ENC PUBLIC KEY", result.get().getEncPublicKey());
+        Assertions.assertEquals(updatedEncPublicKeyHash, result.get().getEncPublicKeyHash());

Also applies to: 347-378

postman-collection/eSignet.postman_collection.json (2)

277-280: Remove duplicate alg/use assignments to reduce confusion.

♻️ Suggested cleanup

-                                        "// Add alg and use values to client public key",
-                                        "publicKey_jwk.alg = \"RS256\";",
-                                        "publicKey_jwk.use = \"sig\";",
-                                        "",

---

379-445: PATCH item is useful; consider normalizing encPublicKey even when reused.
If encryption_public_key already exists but lacks alg/use, the PATCH call can fail validation. Reasserting these fields each time keeps runs deterministic.

🛠️ Suggested tweak

-                                            "const existingEncPublicKey = pm.environment.get(\"encryption_public_key\");",
-                                            "if (!existingEncPublicKey || existingEncPublicKey === '' || existingEncPublicKey === 'null' || existingEncPublicKey === '{}') {",
+                                            "const existingEncPublicKey = pm.environment.get(\"encryption_public_key\");",
+                                            "let enc_publicKey_jwk;",
+                                            "if (!existingEncPublicKey || existingEncPublicKey === '' || existingEncPublicKey === 'null' || existingEncPublicKey === '{}') {",
                                             "    enc_kp = pmlib.rs.KEYUTIL.generateKeypair(\"RSA\", 2048);",
                                             "    enc_privateKey_jwk = pmlib.rs.KEYUTIL.getJWK(enc_kp.prvKeyObj);",
                                             "    enc_publicKey_jwk = pmlib.rs.KEYUTIL.getJWK(enc_kp.pubKeyObj);",
@@
-                                            "    pm.environment.set(\"encryption_private_key\", JSON.stringify(enc_privateKey_jwk));",
-                                            "    pm.environment.set(\"encryption_public_key\", JSON.stringify(enc_publicKey_jwk));",
-                                            "}",
+                                            "    pm.environment.set(\"encryption_private_key\", JSON.stringify(enc_privateKey_jwk));",
+                                            "} else {",
+                                            "    enc_publicKey_jwk = JSON.parse(existingEncPublicKey);",
+                                            "}",
+                                            "enc_publicKey_jwk.alg = \"RSA-OAEP-256\";",
+                                            "enc_publicKey_jwk.use = \"enc\";",
+                                            "pm.environment.set(\"encryption_public_key\", JSON.stringify(enc_publicKey_jwk));",

client-management-service-impl/src/test/java/io/mosip/esignet/ClientManagementServiceTest.java (3)

343-364: Consider using ArgumentCaptor to verify patched entity state.

The test verifies the response but doesn't confirm that the ClientDetail entity passed to save() has the expected patched values. Using ArgumentCaptor would strengthen this test.

♻️ Suggested enhancement

+    `@Captor`
+    ArgumentCaptor<ClientDetail> clientDetailCaptor;
+
     `@Test`
     public void patchClient_withValidClientId_thenPass() throws EsignetException {
         ClientDetail clientDetail = createMockClientDetail("client_id_v1");
         Mockito.when(clientDetailRepository.findById("client_id_v1")).thenReturn(Optional.of(clientDetail));
 
         ClientDetailPatchRequest patchRequest = new ClientDetailPatchRequest();
         patchRequest.setClientName("updated_client_name");
         patchRequest.setLogoUri("http://service.com/new_logo.png");
         patchRequest.setRedirectUris(Arrays.asList("http://service.com/callback"));
         patchRequest.setStatus("ACTIVE");
 
         ClientDetail savedEntity = new ClientDetail();
         savedEntity.setId("client_id_v1");
         savedEntity.setStatus("ACTIVE");
-        Mockito.when(clientDetailRepository.save(Mockito.any(ClientDetail.class))).thenReturn(savedEntity);
+        Mockito.when(clientDetailRepository.save(clientDetailCaptor.capture())).thenReturn(savedEntity);
 
         ClientDetailResponse response = clientManagementService.patchClient("client_id_v1", patchRequest);
 
         Assertions.assertNotNull(response);
         Assertions.assertEquals("client_id_v1", response.getClientId());
         Assertions.assertEquals("ACTIVE", response.getStatus());
+        
+        ClientDetail captured = clientDetailCaptor.getValue();
+        Assertions.assertEquals("http://service.com/new_logo.png", captured.getLogoUri());
     }

---

366-379: Consider using assertThrows for exception testing (optional).

While the try-catch pattern is consistent with existing tests in this file, JUnit 5's assertThrows provides cleaner assertion syntax and ensures the test fails if the exception is not thrown.

♻️ Modern JUnit 5 approach

     `@Test`
     public void patchClient_withNonExistingClientId_thenFail() {
         Mockito.when(clientDetailRepository.findById("non_existing_client")).thenReturn(Optional.empty());
 
         ClientDetailPatchRequest patchRequest = new ClientDetailPatchRequest();
         patchRequest.setClientName("updated_name");
 
-        try {
-            clientManagementService.patchClient("non_existing_client", patchRequest);
-            Assertions.fail();
-        } catch (EsignetException ex) {
-            Assertions.assertEquals(ErrorConstants.INVALID_CLIENT_ID, ex.getErrorCode());
-        }
+        EsignetException ex = Assertions.assertThrows(EsignetException.class, 
+            () -> clientManagementService.patchClient("non_existing_client", patchRequest));
+        Assertions.assertEquals(ErrorConstants.INVALID_CLIENT_ID, ex.getErrorCode());
     }

---

701-718: Consider verifying that the timestamp is actually updated.

The comment states "only timestamp should be updated," but the test doesn't verify this. Using ArgumentCaptor to check that updatedTimes is set (and is recent) would strengthen this test.

♻️ Suggested verification

     `@Test`
     public void patchClient_withEmptyPatchRequest_thenOnlyUpdateTimestamp() throws EsignetException {
         ClientDetail clientDetail = createMockClientDetail("client_id_v1");
+        LocalDateTime originalTimestamp = LocalDateTime.now().minusDays(1);
+        clientDetail.setUpdatedTimes(originalTimestamp);
         Mockito.when(clientDetailRepository.findById("client_id_v1")).thenReturn(Optional.of(clientDetail));
 
         ClientDetailPatchRequest patchRequest = new ClientDetailPatchRequest();
         // All fields are null - only timestamp should be updated
 
         ClientDetail savedEntity = new ClientDetail();
         savedEntity.setId("client_id_v1");
         savedEntity.setStatus("ACTIVE");
-        Mockito.when(clientDetailRepository.save(Mockito.any(ClientDetail.class))).thenReturn(savedEntity);
+        ArgumentCaptor<ClientDetail> captor = ArgumentCaptor.forClass(ClientDetail.class);
+        Mockito.when(clientDetailRepository.save(captor.capture())).thenReturn(savedEntity);
 
         ClientDetailResponse response = clientManagementService.patchClient("client_id_v1", patchRequest);
 
         Assertions.assertNotNull(response);
         Assertions.assertEquals("client_id_v1", response.getClientId());
+        Assertions.assertTrue(captor.getValue().getUpdatedTimes().isAfter(originalTimestamp));
     }

docs/esignet-openapi.yaml (1)

1551-1553: Replace nullable: true with JSON Schema's type array syntax in OpenAPI 3.1.
OpenAPI 3.1 aligns with JSON Schema and removes the nullable keyword entirely. Use type: [object, "null"] instead.

🔧 Suggested fix

                     encPublicKey:
-                      type: object
-                      nullable: true
+                      type:
+                        - object
+                        - 'null'

docs/esignet-openapi.yaml (1)

1427-1430: Align description label with encPublicKey field name.

Line 1427 refers to enc_public_key, but the field is encPublicKey. This can confuse API consumers.

✏️ Suggested doc tweak

-        **Special handling for enc_public_key:**
+        **Special handling for encPublicKey:**

esignet-core/src/main/java/io/mosip/esignet/core/dto/ClientDetailPatchRequest.java (1)

55-56: Consider adding a size constraint on clientNameLangMap.

While keys and values have validation, the map itself has no size limit. An unbounded map could accept excessive language entries, potentially causing memory pressure.

Other collection fields have explicit @Size constraints (e.g., redirectUris max=5, userClaims max=30). For consistency and defensive coding, consider adding a similar constraint:

Proposed fix

-    private Map<@ClientNameLang String,
+    `@Size`(max = 20, message = ErrorConstants.INVALID_CLIENT_NAME_LANG_MAP)
+    private Map<@ClientNameLang String,
             `@Size`(max = 50, message = ErrorConstants.INVALID_CLIENT_NAME_LENGTH) String> clientNameLangMap;

client-management-service-impl/src/main/java/io/mosip/esignet/services/ClientManagementServiceImpl.java (1)

401-409: Minor: Add space before exception parameter in log statement.

📝 Suggested fix

             } catch (EsignetException e) {
-                log.error("Invalid encryption public key",e);
+                log.error("Invalid encryption public key", e);
                 throw e;
             }